feat(selector): select based on kork's RequestContext #1038
Conversation
| @@ -66,16 +66,14 @@ public ArtifactService( | |||
|
|
|||
| public List<Map> getArtifactCredentials(String selectorKey) { | |||
| return mapListCommand( | |||
| "artifactCredentials", | |||
| clouddriverServiceSelector.select(selectorKey)::getArtifactCredentials) | |||
| "artifactCredentials", clouddriverServiceSelector.select()::getArtifactCredentials) | |||
There was a problem hiding this comment.
selectorKey is no longer used (prob could go in a separate PR to clean those up..) (same in a few below)
There was a problem hiding this comment.
yes this PR was already on the big side, might do an opportunistic cleanup later
| @@ -44,13 +44,13 @@ class CertificateService { | |||
|
|
|||
| List<Map> getCertificates(String selectorKey) { | |||
| listCommand("certificates") { | |||
| clouddriverServiceSelector.select(selectorKey).getCertificates() | |||
| clouddriverServiceSelector.select().getCertificates() | |||
There was a problem hiding this comment.
so in places where we used to pass the selectorKey will the selection behavior change? do we care? (I assume the selector was always the app which is not in the authcontext)
There was a problem hiding this comment.
the selector was the "user origin" app, which is in the auth context. You can get the same behavior as before with a config like this:
config:
selectorClass: com.netflix.spinnaker.kork.web.selector.ByUserOriginSelector
origin: deck
There was a problem hiding this comment.
and the clouddriverServiceSelector factory method does the translation, so you get opted into the new selector if you had the previous style of configuration:
dynamicEndpoints:
deck: url
| HystrixFactory.newMapCommand(GROUP, "deleteTask") { | ||
| orcaServiceSelector.withContext(requestContext)deleteTask(id) | ||
| orcaServiceSelector.select()deleteTask(id) |
There was a problem hiding this comment.
| orcaServiceSelector.select()deleteTask(id) | |
| orcaServiceSelector.select().deleteTask(id) |
| @@ -39,14 +39,14 @@ class DataService { | |||
|
|
|||
| void getStaticData(String id, Map<String, String> filters, OutputStream outputStream) { | |||
| voidCommand("static", { | |||
| def response = clouddriverServiceSelector.select(null).getStaticData(id, filters) | |||
| def response = clouddriverServiceSelector.select().getStaticData(id, filters) | |||
There was a problem hiding this comment.
this is interesting where we explicitly didn't want to select in the past but now we do. Probably not an issue, but curious
There was a problem hiding this comment.
true, I'd say eventually we want every call to go through a common selector for consistent behavior
Let's consolidate the interfaces for OrcaServiceSelector and ClouddriverServiceSelector behind a single
select()method. Callers no longer need to pass a selectorKey or gate's RequestContext, everything is now going through kork's RequestContext which is backed by AuthenticatedRequest.As a result gate's RequestContext is now completely unused and we can get rid of it (as well as the deprecated methods in the service selectors).